Regenerate.

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index 4866ba53abe389c73fd9fc030387ac6ea3ec48af..2171ab2345a61be703bae92615a49f45a792c080 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -866,7 +866,7 @@ DEL %TMPDIR%\igc*out
 %PNAME% -i gpx -f reference\igc1.gpx -o igc -F %TMPDIR%\igc.out\r
 @echo off\r
 @echo.\r
-FINDSTR /V "XXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
+FINDSTR /V /R /C:"^LXXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
 CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc1_igc.out\r
 \r
 @echo on\r
@@ -881,7 +881,7 @@ CALL :COMPARE %TMPDIR%\igc.gpx reference\igc1_gpx.out
 %PNAME% -i gpx -f %TMPDIR%\igc.gpx -o igc -F %TMPDIR%\igc.out\r
 @echo off\r
 @echo.\r
-FINDSTR /V "XXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
+FINDSTR /V /R /C:"^LXXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
 CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc1_igc.out\r
 \r
 @echo on\r
@@ -889,7 +889,7 @@ CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc1_igc.out
 %PNAME% -i gpx -f reference\igc1_baro.gpx -i igc -f reference\igc1_igc.out -o igc,timeadj=auto -F %TMPDIR%\igc.out\r
 @echo off\r
 @echo.\r
-FINDSTR /V "XXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
+FINDSTR /V /R /C:"^LXXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
 CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc1_3d.out\r
 \r
 \r
@@ -905,7 +905,7 @@ CALL :COMPARE %TMPDIR%\igc.gpx reference\igc2_gpx.out
 %PNAME% -i gpx -f %TMPDIR%\igc.gpx -o igc -F %TMPDIR%\igc.out\r
 @echo off\r
 @echo.\r
-FINDSTR /V "XXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
+FINDSTR /V /R /C:"^LXXXGenerated by GPSBabel Version" %TMPDIR%\igc.out> %TMPDIR%\igc_sed.out\r
 CALL :COMPARE %TMPDIR%\igc_sed.out reference\igc2_igc.out\r
 \r
 @echo on\r
@@ -1064,7 +1064,7 @@ REM
 \r
 @echo on\r
 @echo Testing...\r
-%PNAME% -i geo -f geocaching.loc -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o\r
+%PNAME% -i geo -f geocaching.loc -x stack,push,copy,nowarn -x stack,push,copy -x stack,push -x stack,pop,replace -x stack,pop,append -x stack,push,copy -x stack,pop,discard -x stack,swap,depth=1 -o arc -F %TMPDIR%\stackfilt.txt\r
 @echo off\r
 @echo.\r
 \r
@@ -1262,12 +1262,14 @@ REM
 REM Dop filter test\r
 REM \r
 DEL %TMPDIR%\dop*\r
+FINDSTR /V /R /C:"<hdop>50" reference\dop-test.gpx | %PNAME% -i gpx -f - -o openoffice -F - | sed 's\RPT...\\g'> %TMPDIR%\dop-hdop.ref\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -i gpx -f reference\dop-test.gpx -x discard,hdop=50 -o openoffice -F - | sed 's\RPT...\\g'> %TMPDIR%\dop-hdop.fil\r
 @echo off\r
 @echo.\r
 CALL :COMPARE %TMPDIR%\dop-hdop.ref %TMPDIR%\dop-hdop.fil\r
+FINDSTR /V /R /C:"<vdop>50" reference\dop-test.gpx | %PNAME% -i gpx -f - -o openoffice -F - | sed 's\RPT...\\g'> %TMPDIR%\dop-vdop.ref\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -i gpx -f reference\dop-test.gpx -x discard,vdop=50 -o openoffice -F - | sed 's\RPT...\\g'> %TMPDIR%\dop-vdop.fil\r
@@ -1501,6 +1503,7 @@ REM
 REM Universal CSV - unicsv\r
 REM \r
 ECHO lat,lon,descr,name,notes,unk,unk> %TMPDIR%\unicsv.txt\r
+TYPE reference\mxf.mxf>> %TMPDIR%\unicsv.txt\r
 @echo on\r
 @echo Testing...\r
 %PNAME% -i unicsv -f %TMPDIR%\unicsv.txt -o gpx -F %TMPDIR%\unicsv.gpx\r
@@ -1508,3 +1511,13 @@ ECHO lat,lon,descr,name,notes,unk,unk> %TMPDIR%\unicsv.txt
 @echo.\r
 CALL :COMPARE %TMPDIR%\unicsv.gpx reference\unicsv.gpx\r
 \r
+REM \r
+REM Basic NMEA tests\r
+REM \r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i nmea -f reference\track\nmea -o gpx -F %TMPDIR%\nmea.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\nmea.gpx reference\track\nmea.gpx\r
+\r